Make it buildable again
Merge pull request #19 from AOSPAL/remix-legacy

Merge