Updates to move to Google Android Compatibility Library.