fuji: cleanup for qcom-common

Change-Id: I33ea6d97420a1a9fdd86f354b62f19074e1cbbaa