Fix WITH_ARM_V7_A flag not corectly set issue

Change-Id: Iece26e1c5d308a046f3ceab8306405eeff36e94c
Signed-off-by: Carton He <carton.he@marvell.com>
Merge "Fix WITH_ARM_V7_A flag not corectly set issue"
Deactivate build for oprofile.

BUG: 13249790
Change-Id: I24d56e195a7aa33c44228af38a758d6156fa1415
Merge "Deactivate build for oprofile."
Merge branch 'android-5.0.0_r2' into HEAD