Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev am: c99bcc69f7

am: f713a1960e

Change-Id: Ie1d361e946cf68ba97352ef6946f9d82ed5b784b

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge

diff --cc core/jni/android/graphics/BitmapFactory.cpp
Simple merge

diff --cc core/jni/android/graphics/Graphics.cpp
Simple merge