am 09e13cc5: Merge "System services detect and register app CPU ABIs"

* commit '09e13cc5f9f98382376eb49bfa6ceb94a50d37a1':
  System services detect and register app CPU ABIs