Merge changes Ia7e7fb61,Iede67e2c

* changes:
  androidmk: Fix LOCAL_FORCE_STATIC_EXECUTABLE
  Implement re-exporting of library headers