Fix bn_common & oppo_apq8064-common

Change-Id: I519b8f309d1642ef808298ffb7c819fb1a3c6585