Rebase gonk-misc

Change-Id: I68d67fabd7d7f3d2a9bb481d3e224329a7c8e294