Merge "Revert "Add setting for enabling CPU frequency scaling."" into pi-dev
am: 7723aed494

Change-Id: Ibc6fb095d97e53b9bd95b58e1fbbb77a92d24145