Revert "oppo-common: Disable unavailable option for now"

This reverts commit 34215a3cdcd9b2a09b0af17fefe2b8d0a1e10260.

Change-Id: I6f473163d094c5a309f08c6e3c3eac293d74b94e
Merge branch 'cm-11.0' into kk_mkt