Cleanup AndroidBoard.mk and BoardConfig.mk

Change-Id: Ib9c4475bc563f07bfb71de2091e68ebe07b21894