Revert "galaxys2-common: match API to AOSP"

This reverts commit 7ea48537ecb05144f64ee33d2666ea83f8c6dd4d.

Change-Id: I2ff8449f3975f27046ec5a58dccab32cf98c7ffd